Get skytrack working again after I hosed it.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4134 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/skytraq.c b/gpsbabel/skytraq.c
index b98057583ea7d962ac1b30f8504af966b028e467..c1ad4923491c57d7c25cf66ae19acf0cd0b8b0ac 100644 (file)
--- a/gpsbabel/skytraq.c
+++ b/gpsbabel/skytraq.c
@@ -244,7 +244,7 @@ wr_buf(const unsigned char *str, int len)
 
 gbuint8 NL[2] = { 0x0D, 0x0A };
 gbuint8 MSG_START[2] = { 0xA0, 0xA1 };
-gbuint8 SECTOR_READ_END[] = "END\0CHECKSUM=";
+gbuint8 SECTOR_READ_END[13] = "END\0CHECKSUM=";
 
 static int
 skytraq_calc_checksum(const unsigned char *buf, int len)
@@ -643,7 +643,7 @@ process_data_item(struct read_state *pst, const item_frame *pitem, int len)
       return res_ERROR;
     }
     ts = me_read32(pitem->full.ts);
-    f.gps_week = ts & 0x00000FFF;
+    f.gps_week = ts & 0x000003FF;
     f.gps_sec = ts >> 12;
     f.x = me_read32(pitem->full.x);
     f.y = me_read32(pitem->full.y);

diff --git a/gpsbabel/testo.d/classic-3.test b/gpsbabel/testo.d/classic-3.test
index 85d57cbd9770293291f8085a36ea89da68c94450..9482f2244175f036f3f1f93edad028f8e2b8118e 100755 (executable)
--- a/gpsbabel/testo.d/classic-3.test
+++ b/gpsbabel/testo.d/classic-3.test
@@ -261,7 +261,7 @@ compare ${REFERENCE}/track/vitovtt-sample.gpx ${TMPDIR}/vitovtt-sample.gpx
 #
 rm -f ${TMPDIR}/mlink*
 gpsbabel -i gpx -f ${REFERENCE}/multiple-links.gpx -o gpx,gpxver=1.1 -F ${TMPDIR}/mlink-1.gpx
-compare ${TMPDIR}/mlink-1.gpx ${REFERENCE}/multiple-links.gpx
+compare ${REFERENCE}/multiple-links.gpx ${TMPDIR}/mlink-1.gpx 
 
 #
 # Geogrid Viewer tracklogs